From 7dd558b33c7e678f6fad6434e85e226242bdbd90 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 6 May 2020 10:09:16 +0100
Subject: [PATCH] Remove "fake SONAME" mechanism

The library is now built as libgtk-4.so.0 (although the ABI is still
not yet stable).
---
 debian/control                      |  4 ++--
 debian/libgtk-4-0.lintian-overrides |  4 ----
 debian/libgtk-4-0.symbols.in        |  2 +-
 debian/rules                        | 12 +++---------
 4 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 debian/libgtk-4-0.lintian-overrides

diff --git a/debian/control b/debian/control
index d75d6bb71c..b96cad63b6 100644
--- a/debian/control
+++ b/debian/control
@@ -72,7 +72,7 @@ Depends: adwaita-icon-theme,
          ${misc:Depends},
          ${shlibs:Depends},
          libgtk-4-common (>= ${source:Version})
-Provides: gtk4-binver-4.0.0, libgtk-4-0.9800.0
+Provides: gtk4-binver-4.0.0
 Recommends: libgtk-4-bin
 Suggests: gvfs,
           librsvg2-common
@@ -94,7 +94,7 @@ Section: debian-installer
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Provides: gtk4-binver-4.0.0, libgtk-4-0.9800.0
+Provides: gtk4-binver-4.0.0
 Description: GTK graphical user interface library - minimal runtime
  This is a udeb, or a microdeb, for the debian-installer.
  .
diff --git a/debian/libgtk-4-0.lintian-overrides b/debian/libgtk-4-0.lintian-overrides
deleted file mode 100644
index f2931edbc3..0000000000
--- a/debian/libgtk-4-0.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# During Gtk 4 development, every release breaks the ABI. For now we use
-# Provides: libgtk-4-0.whatever instead of renaming the binary package,
-# to avoid regular trips through the NEW queue.
-libgtk-4-0: package-name-doesnt-match-sonames libgtk-4-0.*
diff --git a/debian/libgtk-4-0.symbols.in b/debian/libgtk-4-0.symbols.in
index f97964be3a..f2a7e37601 100644
--- a/debian/libgtk-4-0.symbols.in
+++ b/debian/libgtk-4-0.symbols.in
@@ -1,4 +1,4 @@
-libgtk-@APIVER@.so.@SONAME@ @SHARED_PKG@ #MINVER#, libgtk-@APIVER@-@SONAME@
+libgtk-@APIVER@.so.@SONAME@ @SHARED_PKG@ #MINVER#
 * Build-Depends-Package: libgtk-4-dev
  gdk_anchor_hints_get_type@Base 3.91.2
  gdk_app_launch_context_get_display@Base 3.98.2
diff --git a/debian/rules b/debian/rules
index e72375f797..d025c29e05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,7 @@ all_binaries := $(shell sed -ne 's/^Package: *//p' < debian/control)
 LDFLAGS += -Wl,-O1
 
 APIVER := 4
-# The library is packaged as though this is its SONAME version (which will
-# be true for the GTK 4 stable release), to avoid going through the NEW
-# queue a lot...
-FAKE_SONAME := 0
-# ... but while it's in development, the SONAME version is really this,
-# changing with every upstream release
-SONAME := 0.9802.0
+SONAME := 0
 
 LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH)
 
@@ -30,7 +24,7 @@ LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH)
 GTK_BINARY_VERSION := 4.0.0
 
 # Gtk binary version virtual Provide
-GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION), libgtk-$(APIVER)-$(SONAME)
+GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION)
 
 # relative base directory for configuration
 CONFDIR := etc/gtk-4.0
@@ -39,7 +33,7 @@ CONFDIR := etc/gtk-4.0
 MODULES_BASE_PATH := $(LIBDIR)/gtk-4.0/$(GTK_BINARY_VERSION)
 
 # package names
-SHARED_PKG := libgtk-$(APIVER)-$(FAKE_SONAME)
+SHARED_PKG := libgtk-$(APIVER)-$(SONAME)
 COMMON_PKG := libgtk-$(APIVER)-common
 DEV_PKG := libgtk-$(APIVER)-dev
 UDEB_PKG := $(SHARED_PKG)-udeb
-- 
2.30.2